lookingGlass: Stop setting font programmatically

Instead, use CSS to request a monospace font selectively where
it makes sense (the evaluator).

Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/7776
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3413>

diff --git a/data/theme/gnome-shell-sass/widgets/_looking-glass.scss b/data/theme/gnome-shell-sass/widgets/_looking-glass.scss
index 53cf74fffd1ca27e3a70d72a8b238e67af753ec9..d7583b480301beed07de9e11535dd1edb65daa14 100644 (file)
--- a/data/theme/gnome-shell-sass/widgets/_looking-glass.scss
+++ b/data/theme/gnome-shell-sass/widgets/_looking-glass.scss
@@ -88,6 +88,10 @@
   &:hover { border: 1px solid $fg_color; }
 }
 
+#EvalBox {
+  @extend %monospace;
+}
+
 // Extensions
 #lookingGlassExtensions { padding: $base_padding; }
 

diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js
index e3b0de7a2cb9fd9ef9132d654d63810c06f28b6a..9877008774d8201b8765973154e8caa838453d54 100644 (file)
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -1296,11 +1296,6 @@ class LookingGlass extends St.BoxLayout {
         // Sort of magic, but...eh.
         this._maxItems = 150;
 
-        this._interfaceSettings = new Gio.Settings({schema_id: 'org.gnome.desktop.interface'});
-        this._interfaceSettings.connect('changed::monospace-font-name',
-            this._updateFont.bind(this));
-        this._updateFont();
-
         // We want it to appear to slide out from underneath the panel
         Main.uiGroup.add_child(this);
         Main.uiGroup.set_child_below_sibling(this,
@@ -1438,18 +1433,6 @@ class LookingGlass extends St.BoxLayout {
         return Clutter.EVENT_PROPAGATE;
     }
 
-    _updateFont() {
-        let fontName = this._interfaceSettings.get_string('monospace-font-name');
-        let fontDesc = Pango.FontDescription.from_string(fontName);
-        // We ignore everything but size and style; you'd be crazy to set your system-wide
-        // monospace font to be bold/oblique/etc. Could easily be added here.
-        let size = fontDesc.get_size() / 1024.;
-        let unit = fontDesc.get_size_is_absolute() ? 'px' : 'pt';
-        this.style = `
-            font-size: ${size}${unit};
-            font-family: "${fontDesc.get_family()}";`;
-    }
-
     setBorderPaintTarget(obj) {
         if (this._borderPaintTarget != null)
             this._borderPaintTarget.remove_effect(this._redBorderEffect);